Skip to content

Fix issue 16352 - dead-lock in std.allocator.free_list unittest#4988

Merged
andralex merged 2 commits intodlang:masterfrom
WalterWaldron:fix16352
Dec 23, 2016
Merged

Fix issue 16352 - dead-lock in std.allocator.free_list unittest#4988
andralex merged 2 commits intodlang:masterfrom
WalterWaldron:fix16352

Conversation

@WalterWaldron
Copy link
Contributor

@WalterWaldron WalterWaldron commented Dec 22, 2016 •
edited
Loading

https://issues.dlang.org/show_bug.cgi?id=16352

Also fixes deallocateAll not updating free list count and dereferencing after free which were found in the process.

@dlang-bot
Copy link
Contributor

dlang-bot commented Dec 22, 2016

Fix Bugzilla Description
✓ 16352 dead-lock in std.allocator.free_list unittest

@WalterWaldron WalterWaldron force-pushed the fix16352 branch 2 times, most recently from 07d36d6 to 18612b1 Compare December 22, 2016 19:32
@andralex
Copy link
Member

andralex commented Dec 23, 2016 •
edited
Loading

@MartinNowak y iz circleci unhappy?

@WalterWaldron
Copy link
Contributor Author

WalterWaldron commented Dec 23, 2016 •
edited
Loading

y iz circleci unhappy?

@andralex Supposedly its addressed in this PR: #4955 (comment)

@andralex
Copy link
Member

andralex commented Dec 23, 2016

@WalterWaldron push again

@wilzbach
Copy link
Contributor

wilzbach commented Dec 23, 2016

@WalterWaldron push again

Unfortunately before this PR we did not merge into the target branch at CircleCi (it's not supported there out of the box), so you need to rebase :/

@WalterWaldron
Copy link
Contributor Author

WalterWaldron commented Dec 23, 2016

so you need to rebase :/

I squashed the last two commits for the added benefit of not having broken unit tests while bisecting.

@wilzbach
Copy link
Contributor

wilzbach commented Dec 23, 2016

I squashed the last two commits for the added benefit of not having broken unit tests while bisecting.

As the error was happening in the circleci.sh script & it didn't do merges to master before, you really need to run:

git rebase upstream/master

@WalterWaldron
Copy link
Contributor Author

WalterWaldron commented Dec 23, 2016 •
edited
Loading

Ok, I understand now. I've rebased as instructed.

@andralex
Copy link
Member

andralex commented Dec 23, 2016

Auto-merge toggled on

@andralex
Copy link
Member

andralex commented Dec 23, 2016

Thanks @WalterWaldron!

@andralex andralex merged commit 05e9cba into dlang:master Dec 23, 2016
@WalterWaldron WalterWaldron deleted the fix16352 branch December 23, 2016 21:25
@WalterWaldron WalterWaldron mentioned this pull request Dec 24, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andralex andralex andralex approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@WalterWaldron @dlang-bot @andralex @wilzbach